d/p/03: Correct install path

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 43eac54fad356c3225516869c137c230f22accd0..ad6e4de7ca4a6588b893831574c48f0e866e50d8 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -35,7 +35,7 @@ Author: Mathieu Malaterre <malat@debian.org>
 @@ -1,5 +1,8 @@
  # declare installation files
 -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)
-+SET(DCMTK_INSTALL_DATDIR "share/dcmtk${DCMTK_ABI_VERSION}")
++SET(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}")
 +
 +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
 +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)

diff --git a/debian/rules b/debian/rules
index 3a324bd8dbc3b514d1bd384611778023ce153e79..dd45af0111decfd3032c405ca330cc2a9b386db8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,6 @@ override_dh_auto_test-indep:
 
 override_dh_auto_install-arch:
        dh_auto_install
-       # ??
-       mv debian/tmp/usr/etc debian/tmp/
 
 override_dh_auto_install-indep:
        DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install